From 113f006f3d19dd28d9948aea8df40539db9db0fd Mon Sep 17 00:00:00 2001
From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 7 Aug 2007 08:56:08 +0000
Subject: [PATCH] *** empty log message ***

---
 src/ChangeLog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index f52f082f7fe..15afa74a1c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* emacs.c (main)
+	[HAVE_GTK_AND_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]:
+	Call malloc_enable_thread on interactive startup.
+
+	* gmalloc.c (_malloc_thread_enabled_p) [USE_PTHREAD]: New variable.
+	[USE_PTHREAD] (LOCK, UNLOCK, LOCK_ALIGNED_BLOCKS)
+	(UNLOCK_ALIGNED_BLOCKS): Conditionalize with it.
+	(malloc_atfork_handler_prepare, malloc_atfork_handler_parent)
+	(malloc_atfork_handler_child, malloc_enable_thread) [USE_PTHREAD]:
+	New functions.
+
 2007-08-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (redisplay_window): When restoring original buffer
-- 
2.30.2